Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 00:37:57 +0000 (17:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 00:37:57 +0000 (17:37 -0700)
commitef3747d847062b0338a46b609177793ea14e8d97
treedc9797b973b29292b2539e59e28f952d3d926374
parent0567546f8e9173195f40fa5122b7ad93fe17ef8c
parentd1e588794ea8cfbb4c06c3a35e330e84aa818ccc
Merge from trunk.
src/ChangeLog
src/fileio.c
src/lread.c
src/xdisp.c